Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorWolfgang Denk <[email protected]>
Wed, 12 Jan 2011 22:57:05 +0000 (23:57 +0100)
committerWolfgang Denk <[email protected]>
Wed, 12 Jan 2011 22:57:05 +0000 (23:57 +0100)

Trivial merge